Fix for finding a static composition.

diff --git a/src/ChangeLog b/src/ChangeLog
index 56879fff87c5f8426564efae4ae483a351f8ac80..d451e873adbd8384e62ae49ce37c6cca0fd6473c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Kenichi Handa  <handa@m17n.org>
+
+       * composite.c (composition_compute_stop_pos): Fix condition for
+       backward scanning.
+
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):

diff --git a/src/composite.c b/src/composite.c
index dd07ab8f9a28258d1b4bf4c8b988e70e5a0d4601..8a549f4796da89e95030315847cb9a3e1967792d 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1124,7 +1124,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
            }
        }
     }
-  else
+  else if (charpos > endpos)
     {
       /* Search backward for a pattern that may be composed and the
         position of (possibly) the last character of the match is